merge

author kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>

Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)

committer kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>

Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
author kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
committer kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
diff --cc linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
Simple merge
diff --cc linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
Simple merge
diff --cc tools/examples/Makefile
Simple merge
diff --cc tools/python/xen/xend/image.py
Simple merge
diff --cc xen/arch/ia64/xen/domain.c
Simple merge
author	kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
	Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
committer	kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
	Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
		1	2
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	patch \|	diff1 \|	diff2 \|	blob \| history
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/examples/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/python/xen/xend/image.py	patch \|	diff1 \|	diff2 \|	blob \| history
xen/arch/ia64/xen/domain.c	patch \|	diff1 \|	diff2 \|	blob \| history